Modified Room class