Added suport to header and footer