improve schema proxy loader
Fix model/collection generation
Checking in changes prior to tagging of version 1.11.10.