Adding some API Changes to enable Composite Features.