Updated imports for 1.1