Changes for V2 and some minor changes