Added demo metadata capability