added snapshot creation handling