Refactored urls for modulatiry