adding metadata support for vapp too