Adding support for like and else comparisons