Refactored to use methods from BaseSetup