Adabtation to new exporter
New stuff