Updated Space constructor to avoid switch statements