Added focusOnExpand option