Updated users management and routing controls