several changes on DAO objects and entities