Updated to fit changes made in Room class