Improve basic structs