Inlining service and correcting retry signature