Modified import statements