Add support for CDO and less-than