ARMS-113 Add more roles