Chore/common header changes