Improve logging with more context (OMS-313)