Add support for Composite