First step of implementation of configurable headers for #1