Added support for headway definition 2a