Added support for <> parameters