Add export where required