edited client dao, still working on inheritence mapping