Add tracking of manifest