Remapping service calls to meet new signature