Moved wizard code to a separate module