ResetBehavior enhancements