Updates for exports