Add more logging in DataStore