Added support for types in stats