Adds a few more tweaks to the data schema prototype