Add support for debugging