Added support for stats generatio