Improved stats fetching and matching