WP-599/WP-603: Adds analyzers/mappings