Add initial Room support