#2829 JSON Loader improvements

I was not working with eclipse so the formatting for the changed classes had changed. Sorry for that. Would you mind to format my changes, according to your styles?