AF-907 added WP and WP6 support