TParametersToEntities refactored