Added some more fields and assured that Name is defined properly update #5
Merged with changes from HEAD update #5