Refactor + urls changes