refactored entity relations in RelationsEnhancer