Clean Role Class
Add role in subset of role feature #8