Added ability for update content
Added Tracer class
Merge remote-tracking branch 'refs/remotes/origin/dev_refactoring' into dev