Added support for AnnexName and AnnexFlags