Refactored to use common method call for creating metadata datasources.