Added some JSON support but need to find a fix for constants