Update client logic to use magic method instead of a duplicated method for each request type