URL support. Refactoring