Discovery now includes templated mappings