Added statistics tracking