Update for WP 4.1