Updated to support stats system