Replaced static data access with DataStore