Update data framework for end times, & more