We have added a generic type to allow for a custom protocol-id. It would be nice to avoid this generic and re-factor some of the code to allow for a custom protocol-id without generics.