Add more flexibility to adding removing from teams