Added support for engagement tracking