Resources refactored