Update import statements