Corrected exports since API change