Refactoring to accept the new URLs
refactoring