Revise Roles, add default role to Types