Added option to not make snapshots