Default to allow only one key per cell type, and add option to allow old behaviour