Adding support for DEBUG_APPS