Update to new import syntax