Apply new model

Please integrate into master.