Add user stats and optimize