Added support for mixed upper and lower case values