Added support for new snapshot hierarchy