Well, I have 6 retainers with different jobs and use each for very specific purposes. So I find it good as they are. However, if there would be any changes, I'd think something like a Squadron would be most fitting. I'm thinking usage of Apartments, they gotta live somewhere too, or your own private housing and just have them all out at once for easier management.