Added option to disable creating default instances