[minor] Added state based events