Refactored ressources