Work with new mixinless model changes