improved custom metrics