Fixed issue with client not accounting for nested data.