Discovery work
Discovery datastore completed
Fixed tracer in connection pool