Added more debug tools