Updated to latest spark metrics