Added Name and other fileds