Added option to use raw expression in comparisions
Added missing @Override annotation