Updated exports