Schema update
Remove commas
Merge branch 'update-schema-issue62' into develop