(improvement) Refactor Privileges