Copy/update v1 classes to v2 api (WIP)