Updating rooms to use dictionaries rather than dynamic objects