Added more fields to json