Update the code for VS CTP3