Updated for reactive helpers