Make headers generic