Switch to new [id, data] format