Added more API tracing