Added debug tools