Created Client API solution