updates to schema generation.