Addif data source, attempt 2