Updates in various parts of the code to use new Resources and Statuses