Fixes the Popup semantics
Adds some control to data source API