Improve data store initialization.