Added tracer, removed forked es-model gem