adaptation to new data model