Improve cucumber taxonomies feature