Added some properties to domain model