Metadata Data Collection

Updated methods on data collection