Implemented add/remove room logic