Updated for WP release