More struct changes, Gen VI additions