Added debugging support