Start of PopupManager integration