Please move this before the flags, so that all avps are grouped together.