Fix for new data model