Improved importers

Replicated the improvements from the exporters into the importers