Changes on Bean and GenericBeanDAO