added some crucial exports