Tracking Custom Events refs #472