ACF-17: Refactor of importing routine