Adding debugging tools