fix the annotation problem
add support for manual header definition
switch to auto header
add missing fields