Slight refactor to make creating spaces more similar to entities