Added the rest of the headers