Refactoring without proxy to kibana