Minor changed to data stores