Changed entity to fit the new data structure