Metric with complex type added. Usability tweaks.