Added support for code/message in header state (state, and builder)