Reformat the interfaces. Still need filtering on HeaderMap