Added json format for mapping