Add Optional constraint to map keys