Modifed WID to use HandlerMap to resolve handler type.