Added stats tracking