refactor schema to abstract out individual headers and policies