Added non-case-sensitive functionality