re-impl. schema expansion