Fix #5: Proper data store