Added full metric support