Converted a few more CD structs