This will not alter the handler, because rewriting the parser for it being too static is not feasible at this point