Added features, changed to case insensitive matching