Removed need for reflection in HeaderId.cs to make it more portable