remove setter for property "TypeName".
Add KeyNotFoundException
update