CARE#4: Update AbstaractEntity and GenericDao