Switch to use client metadata