Updated to use the HeaderId enum