WIP virtual entity improvements