Implement more flexible primary and secondary home org groups