Make metadata, now data, optional