Added custom call modification