Change api client and manager to composer pattern