Added rooms handling