Add data framework and stuff