use the new data model in more places