Reverted change on json data mapper