Modified import structure