Add more calculators and EOD processors