change header type and add support for clatd

Change-Id: Ia640385790c937c1af78d4ed7397ddce6d72a77a