Added Grouped AVP rules