Added initial capability for capturing metrics