Added json generator