added support for rr:predicateMap, parameterization for rr:language