Adapted models to recent changes.