OCLM-7 Further refactoring, extracted ImportQueue class