Added some experiemental header features.