Refactoring Resource and Collection