Added option to disable auto init