Updated ImportMaster