Added support for stats