Moved types from Entities to Model namespace.