Made it so that it handles the thrift options.

I did this so that we could control the thrift timeouts etc.