Added basic JSON support