added references and removed room clas