Added tenant id
Replaced header name literals with enumeration values