More comments
Restore common Headers interface