shape structs now use cl types