Add plurality switches in AGF messages