Feature/lock on snapshot