Add support for the composite