Added support for generic parameters table