Update call dispatching, to make it easier to read, follow, and extend.
Add the get-roles call.