Smart exports handling