Added a bunch of stuff for the data init.