Added support for data type suffixes (_INT etc, converted in JSON into $int etc)