Adapt to new data out format