New lazy initialization switch