Refactoring Dynamic Mapping Handler