LPS-17439 Go with util pattern