Simplify API Client generation