add support for additional metrics