Refactor role
Merge origin/master