Add data object to tap event
Cleanup