Add parametric param support