Add handler mappings support