Move header collection to API