Added option to use raw expression in comparisions