Minor reorganization in EntitiesHelper
Draft for propertyView component