Adapt WP model changes in core