Add composite-typed variable declarations