Adding instance metric support