Move delta calculation into Analyzer