Better headers for types