Re-ordering of elements to render schema more readable.
Modification and addition to some annotations.