Add roles reorganisation