Add support for parameterized references