Improve roles

Change-Id: I0a0d546779aa4a22411f5811880268a61e803b0e
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>