Add support for has as well as match regexp expressions