[Develop_1]header refactoring