adding metadata support for demo