Finish basic snapshot support