Add Inndiag logic to type 2A + small refactoring (inndiagUtils)