Make the analysis more efficient