Upgraded stats and users to core