DFI refactoring + fix queue usage