Added Step 2 - Replace imports