Added additional stats tracking