WIP on debugging support