feat(popup): Added popup support