Also ported parent map to new generic map class