More work on data format