Updated to reflect OpenIOC 1.1 exporting, plus small updates