Added option for snapshot creation