Model url parameters refactoring