Added storing of header