Updated import statements and added a global class prefix