Refactor Headers concept in to Context flowing