Fix read groups mapping and add Y as base type