data management now in separate framework