Bring Jia up to date with Metis

similarly consider wrapping this in a dict.