Would it be possible to just use the internal boolean and avoid the string matching?