Refactor adding permissions and leader notifications