Refactor importing handler methods