Add option to avoid lowercasing