Format change to match generated code in CLI