Added grouped AVP. Fixes #1