Adding new headers and cpps