Added more debug tracing