Added openstack support