Changes to data model

One name field, Room Number must be String