Added witchspace and hyperspace entries