Add Section usage instead of Composite