Added RefreshLoop support