Using different functions from Gson to make code cleaner and more
readable in core conversion + Misc. Changes in Concat Macro