Continued refactoring for API use v2