Changed ModelState class to a singleton DataStore class