Re-ordering of dimensions to match canonical

Global attributes added to provide more information on data source