Updated the content headers to use the same functions.