Added > Basic rooms handling