Extend ghosting to other entities and change map to vector