Room logic modifications