Further changes for #1260
Tidy up application group entity