Additional integration
Implemented Expand/Collapse