[refactor] More refactoring in to a client API