Added support for Navigation Headers