Fixed #2: Added fields to Structure model.
Fixed #3: Added generic parameters and bounds to Trait model.