Added Expand/Collapse Callbacks

Added Expand/Collapse Callbacks