Adding support for BETWEEN