Added extra header and logging