Facade fix - entity class must be accessible from descendant