New Configuration
Add room support
Issue #3