Refactor roles to a new table