CAPX-32 Link to the importer entites.
CAPX-32 Simplify the load by mapper helper.