Minor tweaks to the data structure