Adding basic metric support