Updated with Client Library Code Generation