Adding debuging tools