Make service builder handler setters more flexible (#2442)

* Add generic parameter to the handler setter

* Constrain Pl::Service in Upgrade rather than S

---------

Co-authored-by: Matteo Bigoi <1781140+crisidev@users.noreply.github.com>