Enhancement Support for TM/JSON