Refactored resources