Updated for latest snapshots