Add 'add-role' option
Fix role delegation to place files in the correct places