(#30): Improve groups' reconciliation