add to Enumaration withValueOpt returning Option