Refactor role authorizations