Changed the way request headers are stored and used