Fixed Entity and EntityDAOImpl implementations.