Added support for Retry groups