Exporter Improvement and some changes to Decoder for the future Importer module