Removed old non-auto generated data structures and completed with new ones.