Change condition in entity type model and collection