Updated to OnyxImporter