More changes for WP