fix: Compatibility with new data model;