Updated to Metrics version 3.0.1