Added support for debugging