Added Domain and generic DAO