Added more metrics and features