Updated the Room model slightly