Added case insensitivity
along with appropriate helper function