Added group json mapper