Modifying API Client