Returned classes using metrics v2 and moved new v3 support to a separate namespace