Reorganized imports
Updated to changes in 2.1 APIs