some more changes to support schema
some more changes to support schema