- add Content-Location and Content-Id support