Step 7: Before adding roles