Enhance logging and ecs client