DataMapping refactoring and support for Json + DynamicState remove