Adding CURRENT, EXPIRED, TIMER, RESET types to StreamEvent