Update models due to compatibility break in e9c9e03