Worked on the domain objects