Update to V3, mostly types