Added vNext infrastructure