Let spaces use proper entity collections