Updated URLs
Refactoring