Add support for DEBUG