Rebuild popover to support API callse
0.2.0