Add a new superclass for room and area.
Same as before to simplify code.