Debug support added