Added DAO and domain implementations