Adding support for request options