diff --git a/ps-grammar/dictionary/tobiDic.dic b/ps-grammar/dictionary/tobiDic.dic
index 05aa0ac8ebfb4ea916756d35ef83e33f75c27e79..29072b313235525b83c220e435aa56009392a1c1 100644
--- a/ps-grammar/dictionary/tobiDic.dic
+++ b/ps-grammar/dictionary/tobiDic.dic
@@ -128250,6 +128250,7 @@ waste	W EY S T
 waste's	W EY S T S
 wastebasket	W EY S T B AE S K AH T
 wastebaskets	W EY S T B AE S K AH T S
+waste_bin	W EY S T B IH N
 wasted	W EY S T AH D
 wasted(2)	W EY S T IH D
 wasteful	W EY S T F AH L
diff --git a/ps-grammar/gprs/gprs.jsgf b/ps-grammar/gprs/gprs.jsgf
index a0bae54f04ae68d595958dc4a1d8a2c0c0716c50..a39997a52495f09646818e6c706f7a86637d4021 100644
--- a/ps-grammar/gprs/gprs.jsgf
+++ b/ps-grammar/gprs/gprs.jsgf
@@ -38,11 +38,11 @@ public <task> = [<robot_name>] [(would | could) you] [please] <command> [please]
 
 <second_location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture;
 
-<appliance_class> = (coat rack) | kitchen_counter | fridge | bar;
-<shelf_class> = book_shelf | (food shelf);
+<appliance_class> = waste_bin | fridge | stove;
+<shelf_class> = bar | side_board | (right side_table) | (left side_table);
 <seat_class> = <seating_class>;
-<seating_class> = sofa | bed;
-<table_class> = kitchen_table | desk | side_table | couch_table | (bedroom table);
+<seating_class> = sofa | armchair | bed;
+<table_class> = kitchen_table | hallway_table | dinner_table | couch_table ;
 <door_class> = (room door);
 <room_class> = kitchen | living_room | bedroom | hallway;
 <utensil_class> = trash_bin;