Fix models to work with v2.023