finishing JSON support