Updated resources data model