more schema expansion