Fix API error
Add API client util for use