update v2 with new structures.