Added more case insensitivity support.