Made changes in SchemaElem hierarchy