Finished Refactoring for the resource properties