Updated DataStore and EmailHandler