Updating commands to handle room dictionary