Additions to support metrics