Better data storage API