All SCR agg metrics now using Metrics classes.
Added more metrics to filters.