Added API tracing
Removed calls to deprecated methods