WP-2541: change fields and configure.