Added revision number, stable sort of datatypes

Sorted datatypes so that there will be more diff stability from revision
to revision