Adds support for more Stats