Changes for WP initial setup