Updating headers to new style