Compatibility with new version of DisCODe
code formatting
New approach to handler invokation
Compilation fixes
comp