Modernized import statements