Added more data init stuff.