Fix schema generator
refactor
Checking in changes prior to tagging of version 1.11.1.