Add payment models and discount models to initializer
Rollback to pre.16
pre.17
Make goose behave like prod