Add Debug support