Changed Header encapsulation implementation