Update schema elements to v1.1
Merge branch 'version1-1-schema' into develop