Updated from jclouds snapshots