Further refactor import