Move Event to Signal package + enhance Tracker