missing schema support for headers - any reason for removing code which works ?