Added a bunch of processing to the Data preparations.