made improvements required to track custom metrics using Bucky