Corrected issue with usage and meta-data