Refactor into role