Follow API refactoring to avoid cycle + quality