Added support for single/multiple item JSONs