Added support for case insensitivity