Commit map integration and DataStore