Add support for vegapvw in master