Feanil/update vpc tools