Added vNext code