Add debugging support