Fix #196 Added event tracking