FIX: Starter, add context without vm