DataMapping support for Json fields and refactoring + Remove of DynamicState