Add suppport for more request types.