Latest changes to support metrics