Updated to export the new stuff