Moving to snapshot lib to pull in recent changes