Refactor role commands