* NonGeneric dao now uses GenericDao so single code is maintained