Make it easier to override endpoint options like timeout.

Make it easier to override endpoint options like timeout. #67