Most of new export functionality is working