- Improved to handle SNAPSHOT's.