Updated wizard for 0.3