DataStore enhancements