Added domain objects and dao layer