GenericDAO modified