Adding stats collection