Added enableTooltip and enablePopover fields