added return of metadata fields