Modular: support for generic parameters