Make basic-example work with the new data container