More M2 structs