Modified for rightscale support