Add the ability to handle generic parameters for return types