Modified default roles
Merge branch 'change-default-roles'

* change-default-roles:
  Modified default roles