Started improving the data representations.