Add more csdl structs