refactored olicy and header schemas