Maps need two types now