Add GYP2 to WP