Added end-to-end debug mode support