Added support for nested offset expressions