Updated envoy loading