Modified room_parts and group_parts