Refactor Permissions #4493