Add custom headers
Mark custom headers as v0.2 feature