Spin out NamedBundle and do minor schema change