Improved handling of large amounts of games