Added support to metadata in instances