Changing Order model to not generate the OrderId by default