Added support for offset expressions