Decoupled data store from file for future improvements.