Improve metrics precision