Refactor URL REST