[ADDED] Decorator pattern on rooms