Changed WithMessageRepeating to more fluent options