Updated for next version
Corrected custom metrics?
Release Version 3.0