Added return values to fire event