use separate methods for assigning different types of roles

Change-Id: I37ce79adaca82b5be14b6ea39418f4a51bb078ac