Add a few more headers that are useful in the RW