Append headers
Remove useless regexp in structure