Add composing stuff