Added more domain objects