WP-2317 Initial features