Add support for additional mappings in custom template