Added extra things to handle content type