0.6.68 Add popup support