added support for parameterized values