Extensions to ODD which remove the need to use raw RELAX NG in content models