Adding support for parameters