Adding debug support to server