Added expand/Collapse methods