Started to add domain objects