Refactor import feature