Resource modifications

The changes necessary to accomodate [these](https://docs.google.com/file/d/0BwGScp7mjYjyeVVmQXdFTm9xSTA/edit) changes.