Refactoring
Working with url option