Refactor to roles and adds in examples