Add new X headers, add underscore/stringy