More work changing the bindings for metadata