Added option for metadata only