[CHANGE] JSON Parser class after review