Added more trace