Add support for dynamic mappings