Changed around enum order to be alphabetical