Add support for xheaders
Fix xheaders for real