Adding Handler Mapping commands