Use new recommended initialization code