Changed syntax of JSON mapping and added manual Html property