More refactoring in DevsHandler