Feature/cass 2.0

Adds metrics from 2.0.9.