Added support for event and qualifier tracking
Added support for event and qualifier tracking