Added several more nsfdata structs