Cleaner Header analysis, and added Server extraction.