Major change to metadata tracking and where the bindings happen