Adding debugging facility