add support of tagged TLVs