Add XTend with SMT headers
Fix XTEND-SMT-HDR