Added ability to view rawJson and changed the location of iterator