Continue apiv2 refactor