#2 Implemented JSON support