Adds roles and controlled_resources