Updated with custom metrics