Added popover support