adding in some openspaces support