POC version
Add events tracking