- Removed IMetadata interface. Back to using DataSourceMetadata for simplicity.