Added support for local debugging