Replaced most structs