Fixing import order