Added custom metrics