Added simplified DAO and domain objects