Add ability to separate data and I_star. No data model changes as of yet.