Make domain object client generic and public