Rework of handleServiceCall method