Convert to generics for the client package