Updated for snapshot 0.4.0