Client sources are now somehow logically grouped