Make import statements more explicit