Refactored the last two resources