Added support for heading... by expression