Reworks complex model builders to account for array json results.