Fixes to the structure.

Removed undefined entries from the structure.