header mapping works now for the three use cases