Add an order attribute, and also update serializer to pull out enum values.