Added support for interactions and tracking