More generic approach to entities.