Updated for Rightscale support