Changes for the role management