Add support for between operator