Got GeoEntitys and Universal working again after refactor.