Support for separated snapshots [Closes #61]