Add Composite

Change-Id: I8f5902e84c6e13846913464f70c30f26c86caa4d