Changes to reflect move of InitSetup classes