Changes for easily creating custom retry policies