Added hyperspace support