Added Modify Client and merged with create_client