Changes to accommodate switch to statshub