Merge pull request #1037 from rustyswayne/Refactor/M-502

Reworks complex model builders to account for array json results.