Add Calls relation. Refactor the code.
QEvaluator header changes.