Updated exports' order