Refactor : JsonDynamic removed & adding macro conditionals to avoid some errors