Added support for to and from heading.