Added a more flexible roles step def.