Improved match scheduling