Refactored web resources