Improve further the performance for BuildVariantMatrix service