Added functionality to DataStore class for checking (Please ignore previous commits)