Changed: DataSourceConfig extracted from PersistenceConfig