Working on GenericEntities