Update for snapshot 1.7 items

Update for snapshot 1.7 items. Issue #174