Update to new import location