add economy support, add some new options