Add SNAPSHOT support