Added future-proofing for SetupAssistant