Reworked exports