Changed Vroom mapping