Various fixes
Implemented JsonOnDemandOnly