Added retry and timeout options