Try the new import structure